* cus-start.el (all): Undo previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9849391e35ecfb9653624d90c1173abaed893899..fd9fe3545796970c1abb113fdfc1a1e398cd63d8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * cus-start.el (all): Undo previous change.
+
 2007-10-13  Glenn Morris  <rgm@gnu.org>
 
        * woman.el (woman0-rename): Fix paren typo.

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c5d50549c5e50e447e8a087f219f6785d1eeba52..179fd6b183ebcda6f5a6cc00b20fb846d67decc3 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -433,7 +433,7 @@ since it could result in memory overflow and make Emacs crash."
                      ((string-match "\\`w32-" (symbol-name symbol))
                       (eq system-type 'windows-nt))
                      ((string-match "\\`mac-" (symbol-name symbol))
-                      (eq window-system 'mac))
+                      (or (eq system-type 'mac) (eq system-type 'darwin)))
                      ((string-match "\\`x-.*gtk" (symbol-name symbol))
                       (featurep 'gtk))
                      ((string-match "\\`x-" (symbol-name symbol))